Imported upstream version '3.0.7' of 'upstream'