Merge remote-tracking branch 'github/pr/87'.
authorPatrice Clement <monsieurp@gentoo.org>
Sun, 13 Sep 2015 17:16:52 +0000 (17:16 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sun, 13 Sep 2015 17:19:12 +0000 (17:19 +0000)

Trivial merge