Proposed fix for issue 1204: only enforce zoom limits in the direction of the zoom.
Merge pull request #1205 from naknak/issue1204

Proposed fix for issue 1204: only enforce zoom limits in the direction of the merge