Fix merge "Events Controller: Add handling for null events"
Merge remote-tracking branch 'origin/master' into Julian
Merge branch 'Julian' of https://github.com/p4r4n01d/TableForEight into Julian