Fixed mscorlib. I have no idea how the tests could have passed
Merge branch 'develop' into future