Merged revisions 85515 via svnmerge from