Imported upstream version '0.3.4' of 'upstream'