Merge remote-tracking branch 'github/pr/242'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 17 Oct 2015 15:13:45 +0000 (15:13 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 17 Oct 2015 15:13:45 +0000 (15:13 +0000)

Trivial merge