Imported upstream version '1.0.54' of 'upstream'