Backports

[Sander Striker]

Hi,

If someone has a bit of time, we've got a bunch of backports in the
STATUS file that already have 3 +1s which can be merged.

Sander