Imported upstream version '1.9.54' of 'upstream'