Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Wed, 8 Mar 2017 12:31:51 +0000 (08:31 -0400)
committerDavid Bremner <david@tethera.net>
Wed, 8 Mar 2017 12:31:51 +0000 (08:31 -0400)
new release candidate, with regexp fix


Trivial merge