Merged revisions 85316 via svnmerge from