Merged revisions 46370 via svnmerge from