Merged hydro-devel into fuerte-devel (src only)