Merge remote-tracking branch 'github/pr/388'.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 23 Nov 2015 17:32:03 +0000 (17:32 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 23 Nov 2015 17:35:01 +0000 (17:35 +0000)

Trivial merge