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