Imported upstream version '0.60.7' of 'upstream'