6-8-2 release
Merge branch '6-8-2' into '6-8-stable'

6.8.2 release

Please check if I didn't do this weird git thing wrong ;-)

/cc @marin @jacobvosmaer