Better formatting of GeoJSON output
Merge remote-tracking branch 'origin/develop' into develop