Merged revisions 46474 via svnmerge from