Imported upstream version '0.60.2' of 'upstream'