Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

Conflicts:
	code/modules/events/event_manager.dm