use a long format instead of the short format
Merge branch 'dateformats' into merge