Imported upstream version '1.0.40' of 'upstream'