Merge remote-tracking branch 'origin/master' into develop-38-horizontal-interpolation-conservative

# Conflicts:
#	nes/methods/horizontal_interpolation.py
#	nes/nc_projections/default_nes.py
#	tests/test_bash_mn4.cmd
#	tests/test_bash_nord3v2.cmd