Merge remote-tracking branch 'github/pr/861'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 16 Feb 2016 11:00:27 +0000 (11:00 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 16 Feb 2016 11:00:27 +0000 (11:00 +0000)

Trivial merge