Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 22 Jul 2015 19:01:06 +0000 (21:01 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 22 Jul 2015 19:01:06 +0000 (21:01 +0200)

Trivial merge