Merge remote-tracking branch 'vignatti/evdev'