Merged revisions 46554 via svnmerge from