Merge branch 'master' into develop-98-mbtile-support

# Conflicts:
#	nes/cli/cli.py
#	nes/cli/geostructure.py
in 29 seconds, using 0 compute credits, and was queued for 1 second