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