Merge remote-tracking branch 'github/pr/415'.
authorPatrice Clement <monsieurp@gentoo.org>
Sun, 29 Nov 2015 12:12:34 +0000 (12:12 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sun, 29 Nov 2015 12:12:34 +0000 (12:12 +0000)

Trivial merge