Imported upstream version '0.60.3' of 'upstream'