Merge remote-tracking branch 'github/pr/654'.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 18 Jan 2016 21:18:24 +0000 (21:18 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 18 Jan 2016 21:18:40 +0000 (21:18 +0000)

Trivial merge