Merged revisions 47377 via svnmerge from