Merge branch 'master' into signpost-cleanup

src/d_netcmd.c

src/p_setup.c

src/p_user.c

src/st_stuff.c

src/strcasestr.c