Merge remote-tracking branch 'github/pr/2027'
authorJames Le Cuirot <chewi@gentoo.org>
Mon, 8 Aug 2016 12:35:46 +0000 (13:35 +0100)
committerJames Le Cuirot <chewi@gentoo.org>
Mon, 8 Aug 2016 12:35:46 +0000 (13:35 +0100)

Trivial merge