Merge remote-tracking branch 'github/pr/664'.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 15 Jan 2016 20:45:00 +0000 (20:45 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 15 Jan 2016 20:45:18 +0000 (20:45 +0000)

Trivial merge