Indigo devel Hydro merged

All these commits have already been merged into Hydro, I'm just moving them to Indigo since I switched to it today for my primary development