Merge remote-tracking branch 'github/pr/268'
authorAlexis Ballier <aballier@gentoo.org>
Sun, 1 Nov 2015 10:10:40 +0000 (11:10 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Sun, 1 Nov 2015 10:10:40 +0000 (11:10 +0100)

Trivial merge