Merged revisions 379070 via svnmerge from