Imported upstream version '0.5.10' of 'upstream'