Imported upstream version '1.0.25' of 'upstream'