Merge remote-tracking branch 'github/pr/644'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 13 Jan 2016 14:07:36 +0000 (14:07 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 13 Jan 2016 14:09:24 +0000 (14:09 +0000)

Trivial merge