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