Merge remote-tracking branch 'github/pr/767'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 2 Feb 2016 11:05:17 +0000 (11:05 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 2 Feb 2016 11:05:17 +0000 (11:05 +0000)

Trivial merge