pick up recent patches to 2.8.2

Charlotte Hausmanrequested to merge
update-from-patch into 2.8.2-DEVELOPMENT

let's pick up the last few patch releases

Merge request reports