Merge remote-tracking branch 'github/pr/640'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 13 Jan 2016 08:31:15 +0000 (08:31 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 13 Jan 2016 08:31:15 +0000 (08:31 +0000)

Trivial merge