Imported upstream version '0.5.16' of 'upstream'