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

Trivial merge