Broaden trackpad detection search; hopefully fixes #293
Merge branch 'master' into targets