Resolving Conflict.

One of the PR's associated with the discussion started in https://github.com/mono/MonoGame/issues/1731

I can't test on all platforms, so submitting for the buildbox to check for errors. Let me know if this breaks functionality on other platforms.