Merged revisions 82865 via svnmerge from