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

Trivial merge