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