Merged revisions 85604 via svnmerge from