WIP
Merge branch 'master' into WIP

* master:
  Work towards bringing XNA and PSM support back.

Conflicts:
	submodules/cor
Improvements.