Imported upstream version '0.6.10' of 'upstream'