Merge remote-tracking branch 'remotes/github/pr/1196'
authorAlexis Ballier <aballier@gentoo.org>
Wed, 6 Apr 2016 08:47:59 +0000 (10:47 +0200)
committerAlexis Ballier <aballier@gentoo.org>
Wed, 6 Apr 2016 08:47:59 +0000 (10:47 +0200)

Trivial merge