Merged revisions 48190 via svnmerge from