Update devel branch for indigo