Imported upstream version '1.6.11' of 'upstream'