Imported upstream version '1.6.12' of 'upstream'