Merge branch 'master' into next

src/hardware/hw_clip.c

src/hardware/hw_main.c

src/hardware/hw_main.h

src/hardware/r_opengl/r_opengl.c

src/m_menu.c

src/p_user.c

src/r_main.c

src/r_main.h

src/r_things.c

src/r_things.h