Merged revisions 47584 via svnmerge from