Applying hidapi patch from  Hans de Goede
Merge branch 'maint'
Merge branch 'master' into next