Merged revisions 47628 via svnmerge from