Inclusion of updates from trunk v2.2 related to the driver as well as fix I suggest (see ticket #861)
The code modifications are needed if daily forcing data is being used
DSG