Merging master into indigo-devel