Merge branch master into hydro-devel

Merge changes from last pull-request (which was in master)