Imported upstream version '0.7.0' of 'bfl'
Overlaid patches from 'hydro'