Merged revisions 48592 via svnmerge from