Merge remote-tracking branch 'remotes/github/pr/982'
authorAlexis Ballier <aballier@gentoo.org>
Sat, 5 Mar 2016 16:16:49 +0000 (17:16 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Sat, 5 Mar 2016 16:16:49 +0000 (17:16 +0100)

Trivial merge