Merged revisions 47287 via svnmerge from