Merged revisions 47709 via svnmerge from