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

Trivial merge