Merge branch 'next' into patch-stuff-again-2

libs/curl/lib64/libcurl.a

libs/curl/lib64/libcurl.dll.a

objs/djgppdos/Debug/.gitignore

objs/djgppdos/Release/.gitignore

src/CMakeLists.txt

src/Makefile

src/Makefile.cfg

src/android/i_cdmus.c

src/android/i_video.c

src/b_bot.c

src/blua/lstrlib.c

src/blua/lvm.c

src/command.c

src/command.h

src/config.h.in

src/console.c

src/console.h

src/d_clisrv.c

src/d_clisrv.h

src/d_main.c