Merge branch 'master' into damage-control

src/d_main.c

src/dehacked.c

src/f_finale.c

src/hardware/hw_light.c

src/info.c

src/info.h

src/m_cheat.c

src/m_cond.c

src/m_menu.c

src/p_enemy.c

src/p_inter.c

src/p_user.c

src/screen.c

src/st_stuff.c

src/y_inter.c