GitHub Merge Test

This is merging in the latest changes from MonoGame/develop into our fork.