Merge branch 'develop-python_migration' of...

Merge branch 'develop-python_migration' of https://earth.bsc.es/gitlab/es/ocean_diagnostics into develop-python_migration

Conflicts:
	earthdiagnostics/ocean/mixedlayersaltcontent.py