Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sat, 11 Jul 2020 02:24:41 +0000 (23:24 -0300)
committerDavid Bremner <david@tethera.net>
Sat, 11 Jul 2020 02:24:41 +0000 (23:24 -0300)

Trivial merge