Merge remote-tracking branch 'github/pr/398'.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 27 Nov 2015 09:12:32 +0000 (09:12 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 27 Nov 2015 09:12:32 +0000 (09:12 +0000)

Trivial merge