Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Wed, 28 Dec 2016 23:41:20 +0000 (08:41 +0900)
committerDavid Bremner <david@tethera.net>
Wed, 28 Dec 2016 23:41:20 +0000 (08:41 +0900)
merge 0.23.4 release


Trivial merge