Imported upstream version '1.8.6' of 'upstream'
Overlaid patches from 'hydro'