Merged revisions 48228 via svnmerge from