Merge branch 'master' into sdl2-port
Merge branch 'sdl2-port' of github.com:j-jorge/plee-the-bear into sdl2-port