Merge remote-tracking branch 'github/pr/84'.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 11 Sep 2015 18:48:40 +0000 (18:48 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 11 Sep 2015 18:48:40 +0000 (18:48 +0000)

Trivial merge