Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Thu, 19 Nov 2015 11:33:01 +0000 (07:33 -0400)
committerDavid Bremner <david@tethera.net>
Thu, 19 Nov 2015 11:33:01 +0000 (07:33 -0400)

Trivial merge