Merged revisions 86902 via svnmerge from