Imported upstream version '0.2.7' of 'None'
Overlaid patches from 'hydro'