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