Update MPS 3.1.4
Windows xmx fix
Fixed Line Endings
Uncommented tests
Space bug in vm options
Merge branch 'cuttingedge'