Merged revisions 47632 via svnmerge from