Pulled in changes in hydro-devel to master