fixed map z-order to avoid oscillations when panning
Merge branch 'stable'