Merged revisions 46506 via svnmerge from