Merge pull request #9964 from geekosaur/drop-8.2