Imported upstream version '3.0.6' of 'upstream'