Updating hydro-devel from master