Merged revisions 47852 via svnmerge from