Imported upstream version '1.7.16' of 'upstream'