Imported upstream version '0.3.6' of 'upstream'