Merge remote-tracking branch 'origin/master' into develop-93-expand-contract

# Conflicts:
#	nes/nc_projections/default_nes.py
#	nes/nc_projections/lcc_nes.py
#	nes/nc_projections/mercator_nes.py
#	nes/nc_projections/rotated_nes.py