Merge remote-tracking branch 'remotes/upstream/develop' into develop
Merge branch 'develop' of https://github.com/Cocos2DXNA/MonoGame into develop