Imported upstream version '1.0.48' of 'upstream'