Merge remote-tracking branch 'github/pr/855'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 16 Feb 2016 10:16:07 +0000 (10:16 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 16 Feb 2016 10:18:48 +0000 (10:18 +0000)
Gentoo-Bug: 514634
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

Trivial merge