Merge branch 'next' into 2.1.24-prep

src/hardware/hw_draw.c

src/hardware/hw_main.h

src/m_misc.c

src/st_stuff.c

src/st_stuff.h