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

Trivial merge