Merge remote-tracking branch 'github/pr/847'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 20 Feb 2016 22:47:52 +0000 (22:47 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 20 Feb 2016 22:48:10 +0000 (22:48 +0000)
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

Trivial merge