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