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

Trivial merge