Merge remote-tracking branch 'github/pr/854'.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 15 Feb 2016 14:50:29 +0000 (14:50 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 15 Feb 2016 14:50:53 +0000 (14:50 +0000)

Trivial merge