Imported upstream version '0.60.4' of 'upstream'