Merged revisions 48357 via svnmerge from