Imported upstream version '0.60.0' of 'upstream'