Merge remote-tracking branch 'remotes/github/pr/943'
authorAlexis Ballier <aballier@gentoo.org>
Tue, 1 Mar 2016 07:53:09 +0000 (08:53 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Tue, 1 Mar 2016 07:53:09 +0000 (08:53 +0100)

Trivial merge