Merge branch 'next' into font_drawer

appveyor.yml

assets/CMakeLists.txt

extras/conf/SRB2-22.cfg

extras/conf/udb/Includes/SRB222_things.cfg

src/Makefile

src/am_map.c

src/am_map.h

src/apng.c

src/apng.h

src/asm_defs.inc

src/b_bot.c

src/b_bot.h

src/byteptr.h

src/command.c

src/command.h

src/config.h.in

src/console.c

src/console.h

src/d_clisrv.c

src/d_clisrv.h