Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Wed, 6 Mar 2019 13:30:07 +0000 (09:30 -0400)
committerDavid Bremner <david@tethera.net>
Wed, 6 Mar 2019 13:30:07 +0000 (09:30 -0400)

Trivial merge