Merged ioq3 commit ioquake/ioq3@6c4d010f29cefcad1e7794674ad4a0e50d962122