Merge branch 'github-pr-103'
authorJames Le Cuirot <chewi@gentoo.org>
Tue, 29 Sep 2015 21:15:26 +0000 (22:15 +0100)
committerJames Le Cuirot <chewi@gentoo.org>
Tue, 29 Sep 2015 21:19:58 +0000 (22:19 +0100)

Trivial merge