Merge remote-tracking branch 'github/pr/805'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 9 Feb 2016 10:54:07 +0000 (10:54 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 9 Feb 2016 10:54:40 +0000 (10:54 +0000)

Trivial merge