Merge remote-tracking branch 'github/pr/371'.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 23 Nov 2015 13:19:09 +0000 (13:19 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 23 Nov 2015 13:19:09 +0000 (13:19 +0000)

Trivial merge