Merged revisions 47707 via svnmerge from