Ignore left/right mouse wheel events on OS X
Merge remote-tracking branch 'refs/remotes/upstream/master'