Sync with indigo

Indigo-devel is missing the latest changes in indigo.