upstream/7.9+dfsg1

David Bremner

@bremner

0711bec8 · Merge tag 'upstream/7.9' into dfsg · Dec 08, 2020

merged upstream/7.9.

No merge conflicts, kept deleted files deleted.