Merged revisions 47850 via svnmerge from