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