Merged revisions 46351-46353 via svnmerge from