Kept trying to fix zooming.
Merge origin/master