Merged revisions 85093 via svnmerge from