Merge remote-tracking branch 'origin/correct_branch' into fix_remove_xarray

# Conflicts:
#	nes/nc_projections/default_nes.py
#	requirements.txt
3 jobs for fix_remove_xarray
in 4 minutes and 24 seconds, using 0 compute credits, and was queued for 30 seconds