Merged revisions 46563 via svnmerge from