Merge remote-tracking branch 'github/pr/718'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 9 Feb 2016 10:57:11 +0000 (10:57 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 9 Feb 2016 10:57:11 +0000 (10:57 +0000)

Trivial merge