Pulling in changes from hydro-devel in preparation for release