Merged revisions 48049 via svnmerge from