More work on the removal of the event
Merge branch 'event_removal' of github.com:prggmr/XPSPL into event_removal

Conflicts:
	src/api.php