Merge remote-tracking branch 'github/pr/474'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 15 Dec 2015 08:13:53 +0000 (08:13 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 15 Dec 2015 08:13:53 +0000 (08:13 +0000)

Trivial merge