Merged revisions 48101 via svnmerge from