Merging master branch to hydro-devel

Needed to resolve a conflict to merge to hydro-devel from master. Development happens on hydro-devel from now on.