Merged revisions 47684 via svnmerge from