EDI Core Module
Merge branch 'master' into edi-wide

Conflicts:
	Src/EDI/Loader.cs