Merge remote-tracking branch 'remotes/github/pr/1054'
authorAlexis Ballier <aballier@gentoo.org>
Tue, 15 Mar 2016 13:37:42 +0000 (14:37 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Tue, 15 Mar 2016 13:41:22 +0000 (14:41 +0100)

Trivial merge