Merge remote-tracking branch 'github/pr/328'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 14 Nov 2015 16:08:00 +0000 (16:08 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 14 Nov 2015 16:08:00 +0000 (16:08 +0000)

Trivial merge