Merge remote-tracking branch 'github/pr/478'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 15 Dec 2015 22:11:57 +0000 (22:11 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 15 Dec 2015 22:13:42 +0000 (22:13 +0000)

Trivial merge