Merged revisions 47051 via svnmerge from