Merge branch 'release-0.9.4' 0.9.4
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 27 Nov 2015 06:17:53 +0000 (07:17 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 27 Nov 2015 06:17:53 +0000 (07:17 +0100)

Trivial merge