Imported upstream version '2.5.2' of 'upstream'