Imported upstream version '0.6.12' of 'upstream'