Indigo devel

merged hydro-devel into indigo-devel