Merge remote-tracking branch 'github/pr/26'.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 11 Sep 2015 19:35:59 +0000 (19:35 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 11 Sep 2015 19:37:12 +0000 (19:37 +0000)

Trivial merge