Merge pull request #6626 from neheb/libevdev