Merge remote-tracking branch 'github/pr/498'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 23 Dec 2015 10:05:26 +0000 (10:05 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 23 Dec 2015 10:05:26 +0000 (10:05 +0000)

Trivial merge