upstream/7.1+dfsg1

David Bremner

@bremner

638cb143 · Merge tag 'upstream/7.1' into dfsg · Dec 23, 2018

merge v7.1, leave prev. deleted files deleted