Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Nov 2017 05:59:05 +0000 (06:59 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Nov 2017 05:59:05 +0000 (06:59 +0100)

Trivial merge