Imported upstream version '1.6.4' of 'upstream'
Overlaid patches from 'indigo_patch'