Imported upstream version '0.4.24' of 'upstream'