Merge branch 'release-0.9.5' 0.9.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 11 Jul 2016 17:55:51 +0000 (19:55 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 11 Jul 2016 17:55:51 +0000 (19:55 +0200)

Trivial merge