Imported upstream version '0.6.11' of 'upstream'