**System Information**
OS X 10.11.2
EVGA GeForce GTX 960
Logitech Performance MX mouse
**Blender Version**
Broken: a8dd0af8cf793f991bcaa0c219c1a3b2dc10a910
Worked: f42ae6c569fd09a17f6554a2c72057239e5477ec
**Short description of error**
Using the scroll wheel on my mouse rotates the 3D view up and down instead of zooming in and out, like I would expect. The user preferences are all set to default, and disabling the trackpad bindings disables zooming altogether. I'm using a desktop and I do not have a trackpad, nor any multitouch devices (to my knowledge). The release version 2.76b does not have this commit and does not have this issue.
**Exact steps for others to reproduce the error**
Open Blender a8dd0af in OS X 10.11 on the default scene. Dismiss the splash screen. Position the mouse cursor over the 3D viewport. Scroll the mouse wheel. Observe a horizontal camera orbit. Open User Preferences -> Input -> 3D View -> 3D View (Global), and observe Zoom View set to Mouse Wheel and Rotate View set to Mouse/Trackpad Pan.