Merge remote-tracking branch 'github/pr/247'
authorAlexis Ballier <aballier@gentoo.org>
Sat, 17 Oct 2015 14:09:28 +0000 (16:09 +0200)
committerAlexis Ballier <aballier@gentoo.org>
Sat, 17 Oct 2015 14:09:28 +0000 (16:09 +0200)

Trivial merge