Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 11 Jul 2016 18:03:57 +0000 (20:03 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 11 Jul 2016 18:03:57 +0000 (20:03 +0200)

Trivial merge