fix zoom behavior when user opts out of current location
Merge branch 'master' into gh-pages