Accidently removed this file.
Merge remote-tracking branch 'upstream/indigo-devel' into indigo-devel