Merge remote-tracking branch 'github/pr/868'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 16 Feb 2016 23:42:11 +0000 (23:42 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 16 Feb 2016 23:42:32 +0000 (23:42 +0000)
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

Trivial merge