Imported upstream version '1.6.7' of 'upstream'