Merge branch 'master' into debian
authorPeter Michael Green <plugwash@debian.org>
Thu, 17 Jan 2019 00:41:55 +0000 (00:41 +0000)
committerPeter Michael Green <plugwash@debian.org>
Thu, 17 Jan 2019 00:41:55 +0000 (00:41 +0000)

Trivial merge