Merge remote-tracking branch 'github/pr/682'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 19 Jan 2016 19:57:36 +0000 (19:57 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 19 Jan 2016 20:25:33 +0000 (20:25 +0000)

Trivial merge