Merge remote-tracking branch 'github/pr/272'
authorJames Le Cuirot <chewi@gentoo.org>
Sun, 25 Oct 2015 22:48:40 +0000 (22:48 +0000)
committerJames Le Cuirot <chewi@gentoo.org>
Sun, 25 Oct 2015 22:53:25 +0000 (22:53 +0000)

Trivial merge