Merge remote-tracking branch 'github/pr/666'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 16 Jan 2016 22:31:00 +0000 (22:31 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 16 Jan 2016 22:31:25 +0000 (22:31 +0000)

Trivial merge