Last master state before the SDL2 branch merge