#develop: Modfy failure which occured at the previous merge.
Merge branch 'develop' of github.com:nansencenter/nansat into develop
#develop: Modify wiki_tutorial to adapt for develop branch.