Merge remote-tracking branch 'github/pr/408'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 2 Jan 2016 14:52:43 +0000 (14:52 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 2 Jan 2016 14:53:09 +0000 (14:53 +0000)

Trivial merge