Merge remote-tracking branch 'github/pr/482'.
authorPatrice Clement <monsieurp@gentoo.org>
Thu, 17 Dec 2015 07:53:07 +0000 (07:53 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Thu, 17 Dec 2015 07:53:07 +0000 (07:53 +0000)

Trivial merge