Merge tag 'debian/0.25-5'
authorDavid Bremner <david@tethera.net>
Thu, 10 Aug 2017 11:08:49 +0000 (07:08 -0400)
committerDavid Bremner <david@tethera.net>
Thu, 10 Aug 2017 11:08:49 +0000 (07:08 -0400)
uploaded to unstable


Trivial merge