Dates bugfix
Merge remote-tracking branch 'origin/master'

Conflicts: events.json