Merged revisions 85896 via svnmerge from