Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	README.md