Merge branch 'next' into public_next

src/d_clisrv.c

src/lua_script.c

src/p_map.c

src/y_inter.c