Merged revisions 46845 via svnmerge from