Merge remote-tracking branch 'remotes/github/pr/1003'
authorAlexis Ballier <aballier@gentoo.org>
Mon, 7 Mar 2016 18:39:56 +0000 (19:39 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Mon, 7 Mar 2016 18:49:55 +0000 (19:49 +0100)

Trivial merge