Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Tue, 24 Sep 2019 00:36:01 +0000 (21:36 -0300)
committerDavid Bremner <david@tethera.net>
Tue, 24 Sep 2019 00:36:01 +0000 (21:36 -0300)

Trivial merge