Merge remote-tracking branch 'remotes/origin/master' into devel_better_data_management

# Conflicts:
#	VERSION
#	earthdiagnostics/earthdiags.py
#	earthdiagnostics/ocean/interpolate.py
#	setup.py