Imported upstream version '1.0.24' of 'upstream'