Imported upstream version '1.0.16' of 'upstream'