Merged revisions 48179 via svnmerge from