Imported upstream version '0.5.20' of 'upstream'