Merge remote-tracking branch 'github/pr/859'.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 15 Feb 2016 13:13:32 +0000 (13:13 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 15 Feb 2016 13:13:32 +0000 (13:13 +0000)

Trivial merge