Merge branch 'develop' of https://github.com/mono/MonoGame into develop

Conflicts:
	MonoGame.Framework/MonoGame.Framework.Android.csproj
	MonoGame.Framework/MonoGame.Framework.Linux.csproj
	MonoGame.Framework/MonoGame.Framework.Windows.csproj
Merge branch 'develop' into InfiniteFlight

Conflicts:
	MonoGame.Framework/MonoGame.Framework.Linux.csproj
	MonoGame.Framework/MonoGame.Framework.Windows.csproj