Merging indigo-devel into master