fix geojson not accepting geometry arrays, close #1840
Merge branch 'master' into stable

* master:
  fix geojson not accepting geometry arrays, close #1840