Merged revisions 85276 via svnmerge from