Merge remote-tracking branch 'remotes/github/pr/189'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 13 Oct 2015 10:36:05 +0000 (10:36 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 13 Oct 2015 10:36:30 +0000 (10:36 +0000)

Trivial merge