Merged revisions 47372 via svnmerge from