Merge remote-tracking branch 'github/pr/831'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 10 Feb 2016 22:01:27 +0000 (22:01 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 10 Feb 2016 22:01:27 +0000 (22:01 +0000)

Trivial merge