Imported upstream version '1.8.7' of 'upstream'