r104163
Merge branch 'master' into MonoGame