Merge remote-tracking branch 'github/pr/487'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 19 Dec 2015 19:03:35 +0000 (19:03 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 19 Dec 2015 19:06:52 +0000 (19:06 +0000)

Trivial merge