Merged revisions 46775 via svnmerge from