Merge remote-tracking branch 'hsaito/master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 15 Jul 2015 18:48:53 +0000 (20:48 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 15 Jul 2015 18:48:53 +0000 (20:48 +0200)

Trivial merge