Imported upstream version '0.4.16' of 'upstream'