Merge remote-tracking branch 'github/pr/517'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 12 Jan 2016 10:30:04 +0000 (10:30 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 12 Jan 2016 10:30:04 +0000 (10:30 +0000)

Trivial merge