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

# Conflicts:
#	nes/nc_projections/default_nes.py
in 36 seconds, using 0 compute credits, and was queued for 0 seconds