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