Imported upstream version '0.9.6' of 'upstream'