Merge remote-tracking branch 'github/pr/587'.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 4 Jan 2016 21:30:17 +0000 (21:30 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 4 Jan 2016 21:30:54 +0000 (21:30 +0000)

Trivial merge