Imported upstream version '1.6.10' of 'upstream'