Imported upstream version '2.4.2' of 'upstream'