Sort the events before displaying them
Merge remote-tracking branch 'origin/master'