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

Trivial merge