Merge branch 'next' into plane-fixes

src/android/i_system.c

src/console.c

src/console.h

src/d_main.c

src/djgppdos/i_system.c

src/doomdef.h

src/dummy/i_system.c

src/hardware/hw_main.c

src/hardware/hw_md2.c

src/hardware/hw_md2.h

src/hu_stuff.c

src/i_system.h

src/lua_hudlib.c

src/m_cheat.c

src/m_menu.c

src/nds/i_system.c

src/p_map.c

src/p_mobj.c

src/p_setup.c

src/p_spec.c