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

Trivial merge