Merged revisions 379344 via svnmerge from