Update to develop upstream for SDL2 start

Back to merging from these chimps again.