Weird merge issue.
Merge branch 'integratedFixes' of https://github.com/My64K/MonoGame into integratedFixes