Hydro - latest changes

Just keeping branch master up to date with the branch hydro, since master is the default branch.