Imported upstream version '0.5.80' of 'upstream'