Merge branch 'release-0.9.6' 0.9.6
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 26 Oct 2016 16:48:04 +0000 (18:48 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 26 Oct 2016 16:48:04 +0000 (18:48 +0200)

Trivial merge