Imported upstream version '1.7.12' of 'upstream'