Merged revisions 379180 via svnmerge from