Imported upstream version '0.6.0' of 'upstream'