Merge remote-tracking branch 'github/pr/359'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 17 Nov 2015 10:45:39 +0000 (10:45 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 17 Nov 2015 10:45:39 +0000 (10:45 +0000)

Trivial merge