Merge https://github.com/jb-1980/flexdates
Update to latest code