Merging master into hydro-devel