Imported upstream version '1.0.7' of 'upstream'