Merged revisions 48088 via svnmerge from