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

# Conflicts:
#	nes/nc_projections/default_nes.py
#	tests/test_bash.mn5.sh
3 jobs for develop-93-expand-contract
in 49 seconds, using 0 compute credits, and was queued for 2 seconds