Merged revisions 48396 via svnmerge from