Merge remote-tracking branch 'github/pr/425'.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 11 Dec 2015 21:09:01 +0000 (21:09 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 11 Dec 2015 21:09:18 +0000 (21:09 +0000)

Trivial merge