Imported upstream version '0.2.4' of 'upstream'
Overlaid patches from 'indigo'