Imported upstream version '0.5.17' of 'upstream'