Merge remote-tracking branch 'remotes/github/pr/188'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 13 Oct 2015 11:57:53 +0000 (11:57 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 13 Oct 2015 11:58:20 +0000 (11:58 +0000)

Trivial merge