Imported upstream version '0.5.8' of 'upstream'