Merged revisions 85720 via svnmerge from