Merge remote-tracking branch 'github/pr/461'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 22 Dec 2015 10:51:25 +0000 (10:51 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 22 Dec 2015 10:51:25 +0000 (10:51 +0000)

Trivial merge