Merge remote-tracking branch 'github/pr/283'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 24 Oct 2015 14:13:23 +0000 (14:13 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 24 Oct 2015 14:14:21 +0000 (14:14 +0000)

Trivial merge