r2: fixed image loading issue
Merge branch 'master' into sdl2