Merged revisions 48906 via svnmerge from