Merge remote-tracking branch 'github/pr/634'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 12 Jan 2016 10:26:15 +0000 (10:26 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 12 Jan 2016 10:26:32 +0000 (10:26 +0000)

Trivial merge