Merge branch 'release/0.9.1' 0.9.1
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 18 Jul 2015 19:31:14 +0000 (21:31 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 18 Jul 2015 19:31:14 +0000 (21:31 +0200)

Trivial merge