Merged revisions 85684 via svnmerge from