Imported upstream version '3.0.4' of 'upstream'