Merge remote-tracking branch 'github/pr/395'.
authorPatrice Clement <monsieurp@gentoo.org>
Thu, 26 Nov 2015 10:06:13 +0000 (10:06 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Thu, 26 Nov 2015 10:06:13 +0000 (10:06 +0000)

Trivial merge