Imported upstream version '0.4.7' of 'upstream'