Add date formatting.
Merge branch 'master' into server