MacOSX - Meta-wheel to zoom in/out, not Ctrl-wheel
Merge branch 'wheel' into v4.1.0beta