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