Post merge SDL 2.0 conflicts, redownloaded SDL 2.0 and trashed on top of what we have. SDL 2.0 should be up to date