Merge remote-tracking branch 'github/pr/494'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 19 Dec 2015 18:58:52 +0000 (18:58 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 19 Dec 2015 18:59:52 +0000 (18:59 +0000)

Trivial merge