Imported upstream version '1.5.34' of 'upstream'