Merged revisions 48956 via svnmerge from