Merge remote-tracking branch 'github/pr/238'
authorAlexis Ballier <aballier@gentoo.org>
Sat, 17 Oct 2015 13:53:54 +0000 (15:53 +0200)
committerAlexis Ballier <aballier@gentoo.org>
Sat, 17 Oct 2015 13:53:54 +0000 (15:53 +0200)

Trivial merge