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