Merge remote-tracking branch 'remotes/github/pr/701'
authorAlexis Ballier <aballier@gentoo.org>
Fri, 22 Jan 2016 10:47:33 +0000 (11:47 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Fri, 22 Jan 2016 10:47:33 +0000 (11:47 +0100)

Trivial merge