Imported upstream version '0.60.6' of 'upstream'