upstream/3.1.2+dfsg1

David Bremner

@bremner

96608eac · Merge branch 'upstream' into dfsg · Feb 06, 2019

upstream 3.1.2, less some non-free things