Merged revisions 48382 via svnmerge from