Merge branch 'develop' into patches

Conflicts:
	MonoGame.Framework/Graphics/Shader/ConstantBuffer.cs
Merge branch 'update-protobuild' into patches