Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sun, 10 Feb 2019 13:47:47 +0000 (09:47 -0400)
committerDavid Bremner <david@tethera.net>
Sun, 10 Feb 2019 13:47:47 +0000 (09:47 -0400)

Trivial merge