Merge branch 'release/0.9.2' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 19 Jul 2015 19:01:16 +0000 (21:01 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 19 Jul 2015 19:01:16 +0000 (21:01 +0200)

Trivial merge