Merged revisions 48960 via svnmerge from