Imported upstream version '1.0.34' of 'upstream'