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