Merged revisions 86296 via svnmerge from