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

Trivial merge