Merge branch 'master' (early part) into sdl2
Merge branch 'master' into sdl2