see: https://github.com/Norwegian-marine-datacentre/mareano/issues/121
Merge branch 'master_and_upgrade' of https://github.com/Norwegian-marine-datacentre/mareano into master_and_upgrade