Merge branch 'next' into movement-refactor

CMakeLists.txt

appveyor.yml

extras/conf/SRB2-22.cfg

src/am_map.c

src/b_bot.c

src/config.h.in

src/d_clisrv.c

src/d_main.c

src/d_net.c

src/d_player.h

src/dehacked.c

src/doomdef.h

src/doomstat.h

src/g_demo.c

src/g_game.c

src/hardware/hw_light.c

src/hardware/hw_main.c

src/hu_stuff.c

src/hu_stuff.h

src/info.c