Merge tag 'debian/0.25-4'
authorDavid Bremner <david@tethera.net>
Fri, 4 Aug 2017 22:43:33 +0000 (18:43 -0400)
committerDavid Bremner <david@tethera.net>
Fri, 4 Aug 2017 22:43:33 +0000 (18:43 -0400)
uploaded to unstable


Trivial merge