Merge remote-tracking branch 'github/pr/830'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 10 Feb 2016 16:23:57 +0000 (16:23 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 10 Feb 2016 16:23:57 +0000 (16:23 +0000)

Trivial merge