merge with master

CMakeLists.txt

appveyor.yml

src/am_map.c

src/am_map.h

src/command.c

src/config.h.in

src/console.c

src/d_clisrv.c

src/d_main.c

src/d_netcmd.c

src/d_netcmd.h

src/dehacked.c

src/doomdef.h

src/doomstat.h

src/f_finale.c

src/g_game.c

src/hardware/hw_md2.c

src/hardware/hw_md2.h

src/info.c

src/info.h