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

Trivial merge