fix formatter date format string
Merge branch 'jeff-dev'