Merged revisions 47437 via svnmerge from