Imported upstream version '0.3.16' of 'upstream'