And now a 'copy&paste' bug
Merge branch 'features/events-model'