Merge pull request #2219 from apache/jbilleter/2.8

Prepare for 2.8.2