Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/nansencenter/nansat into develop