Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Fri, 7 Oct 2016 01:56:46 +0000 (22:56 -0300)
committerDavid Bremner <david@tethera.net>
Fri, 7 Oct 2016 01:56:46 +0000 (22:56 -0300)

Trivial merge