Merged revisions 379312 via svnmerge from