Imported upstream version '0.6.7' of 'upstream'