Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 26 May 2014 18:02:30 +0000 (20:02 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 26 May 2014 18:02:30 +0000 (20:02 +0200)

Trivial merge