Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	code/client/snd_dma.c