Imported upstream version '1.0.4' of 'upstream'