Merge branch 'master' into ghost-networking

.gitattributes

CMakeLists.txt

appveyor.yml

assets/CMakeLists.txt

comptime.bat

comptime.sh

src/CMakeLists.txt

src/Makefile

src/Makefile.cfg

src/blua/luaconf.h

src/comptime.c

src/config.h.in

src/console.c

src/d_clisrv.c

src/d_main.c

src/d_netcmd.c

src/d_player.h

src/dehacked.c

src/doomdef.h

src/doomtype.h