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

Trivial merge