Fixed #2361, plot bands disappearing under certain conditions when zooming in so that parts are clipped.
Fixed #3635, markers overlapping in cases where they should not, according to the default behaviour.
Merge remote-tracking branch 'upstream/master'