Merge branch 'release-0.9.7' 0.9.7
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 7 Oct 2017 16:55:06 +0000 (18:55 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 7 Oct 2017 16:55:06 +0000 (18:55 +0200)

Trivial merge