Merged revisions 48375 via svnmerge from