Fix sideways git scrolling in Firefox on an decent trackpad
Merge remote-tracking branch: upstream/master