Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Thu, 1 Dec 2016 12:57:48 +0000 (08:57 -0400)
committerDavid Bremner <david@tethera.net>
Thu, 1 Dec 2016 12:57:48 +0000 (08:57 -0400)

Trivial merge