Merged revisions 48223 via svnmerge from