Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 26 Oct 2016 16:52:52 +0000 (18:52 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 26 Oct 2016 16:52:52 +0000 (18:52 +0200)

Trivial merge