Imported upstream version '1.0.12' of 'upstream'