Moved from master into hydro-devel + doc for indigo

* Hydro: Moved from master into hydro-devel
* Indigo: documentation only