Merged revisions 85997 via svnmerge from