Merge branch 'next' into maretimers

.circleci/config.yml

.gitattributes

.gitlab-ci.yml

appveyor.yml

cpdebug.mk

src/Android.mk

src/CMakeLists.txt

src/Makefile

src/Makefile.d/detect.mk

src/Makefile.d/features.mk

src/Makefile.d/win32.mk

src/Sourcefile

src/am_map.c

src/android/i_net.c

src/blua/liolib.c

src/command.c

src/config.h.in

src/d_clisrv.c

src/d_main.c

src/deh_soc.c