Merged revisions 47897 via svnmerge from