Merged revisions 47625 via svnmerge from