Merge remote-tracking branch 'github/pr/618'.
authorPatrice Clement <monsieurp@gentoo.org>
Thu, 7 Jan 2016 08:50:12 +0000 (08:50 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Thu, 7 Jan 2016 08:50:35 +0000 (08:50 +0000)

Trivial merge