Merge branch 'master' into next

src/android/i_cdmus.c

src/djgppdos/i_cdmus.c

src/s_sound.c

src/sdl/IMG_xpm.c

src/sdl/SDL_icon.xpm

src/sdl/i_video.c

src/sdl12/i_cdmus.c

src/win32/win_cd.c

src/win32ce/win_cd.c