SRB2 2.1.7 release
Merge branch 'master' into sdl2