Merge branch 'master' into mi-tinkers-with-lua-again

src/am_map.c

src/am_map.h

src/d_netcmd.c

src/dehacked.c

src/doomdef.h

src/g_game.c

src/hardware/hw_light.c

src/info.c

src/info.h

src/m_menu.c

src/m_menu.h

src/p_enemy.c

src/p_inter.c

src/p_map.c

src/p_mobj.c

src/p_user.c

src/r_data.c

src/sdl/i_system.c

src/sdl/i_video.c

src/sdl/sdlmain.h