Merge branch 'master' into next

src/f_finale.c

src/hardware/hw_defs.h

src/hardware/hw_draw.c

src/hardware/hw_drv.h

src/hardware/hw_glob.h

src/hardware/hw_main.c

src/hardware/r_opengl/r_opengl.c

src/sdl/hwsym_sdl.c

src/sdl/i_video.c

src/sdl/ogl_sdl.c

src/sdl12/hwsym_sdl.c

src/sdl12/i_video.c

src/v_video.c

src/win32/win_dll.c