Format date as today, yesterday etc
Merge branch 'master' into builds
7.0