Changed handling of zoom limits to support log-zoom.
Merge branch 'master' into gh-pages