add option to disable automatic zoom/pan of map
Merge remote-tracking branch 'upstream/master'