Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Thu, 17 Aug 2017 00:44:43 +0000 (21:44 -0300)
committerDavid Bremner <david@tethera.net>
Thu, 17 Aug 2017 00:44:43 +0000 (21:44 -0300)
merge in debian-only changes


Trivial merge