Merge pull request #1 from nansencenter/master

sync of nansencenter:master into akorosov:master
Test update at akorosov/nansat:test_fork
Merge pull request #2 from akorosov/test_forked

Test update at akorosov/nansat:test_fork
Merge pull request #3 from akorosov/master

test merge of akorosov:master into nansencenter:master after merging at akorosov