Merge remote-tracking branch 'github/pr/222'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 24 Oct 2015 15:31:11 +0000 (15:31 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 24 Oct 2015 15:31:11 +0000 (15:31 +0000)

Trivial merge