Avoid another signed/unsigned warning
Merge branch 'master' into sdl2