Merged revisions 85850 via svnmerge from