Merge remote-tracking branch 'github/pr/2235'
authorAlexis Ballier <aballier@gentoo.org>
Wed, 7 Sep 2016 08:28:18 +0000 (10:28 +0200)
committerAlexis Ballier <aballier@gentoo.org>
Wed, 7 Sep 2016 08:28:18 +0000 (10:28 +0200)

Trivial merge