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