Merged revisions 47053 via svnmerge from