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

Trivial merge