Merge branch 'master' of https://github.com/PEMapModder/PEMapModder-Utils

Conflicts:
	src/pemapmodder/utils/CallbackEventExe.php