Merged revisions 48478 via svnmerge from