Merge branch 'master' into next

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/hu_stuff.c

src/i_system.h

src/m_menu.c

src/nds/i_system.c

src/p_setup.c

src/sdl/i_system.c

src/sdl/ogl_sdl.h

src/sdl/sdlmain.h

src/sdl12/i_system.c

src/v_video.c

src/v_video.h

src/win32/win_sys.c

src/win32ce/win_sys.c