Merge remote-tracking branch 'github/pr/795'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 6 Feb 2016 10:12:26 +0000 (10:12 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 6 Feb 2016 10:12:45 +0000 (10:12 +0000)

Trivial merge