Upgrade to SDL 2.0