Fixed multiple bugs with date formatting.
Merge remote-tracking branch 'origin/master'