updated with latest monogame upstream
Merge branch 'master' of https://github.com/Cocos2DXNA/cocos2d-xna

Conflicts:
	MonoGame