Merged revisions 85540 via svnmerge from