Merged revisions 48015 via svnmerge from