Merge remote-tracking branch 'origin/update_geojs'
Updated geojs
Merge remote-tracking branch 'origin/update_geojs' into next