Imported upstream version '0.6.9' of 'upstream'