Merge tag 'debian/0.25-3'
authorDavid Bremner <david@tethera.net>
Thu, 3 Aug 2017 14:59:32 +0000 (10:59 -0400)
committerDavid Bremner <david@tethera.net>
Thu, 3 Aug 2017 14:59:32 +0000 (10:59 -0400)
uploaded to unstable


Trivial merge