events_controller: endarify isn't a thing (I is stupid)
Merge branch 'master' into clean-up

Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>