Merged revisions 47635 via svnmerge from