Merged revisions 82867 via svnmerge from