Fix #278.
Merge branch 'dev' into feed-hydrology-from-file