Merged revisions 82802 via svnmerge from