Imported upstream version '2.79.0' of 'upstream'