Imported upstream version '1.6.8' of 'upstream'