Imported upstream version '3.1.7' of 'upstream'