Merged revisions 47701 via svnmerge from