Update to trunk 10060
Sync with Antipodes - SDL2