Imported upstream version '0.8.7' of 'upstream'