Fix syntax error
Merge branch 'indigo-devel' into indigo