Merged revisions 47239 via svnmerge from