Converge towards sdl2 branch
Merge branch 'master' into sdl2

Conflicts:
	sdl_main.cc
Use new[] instead of malloc()
Merge branch 'master' into sdl2