Imported upstream version '1.0.18' of 'upstream'