Merged revisions 47823 via svnmerge from