Trabajo
Trabajo
Merge branch 'master' into Release

Conflicts:
	DummyFile_XMMath.txt
Release 1.1