Fix the default date format to enforce 2-4 digit years
Merge branch 'fix_date_format'