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

Trivial merge