merge dev; resolve conflicts in src/base/hydrology/, mostly having to do with splitting class definitions over multiple source files
Merge commit '2a4646d' into dev