Merge branch 'master' of https://repo.or.cz/d2df-sdl