Merged revisions 48363 via svnmerge from