Merge commit '84881a66140ad93d0b6cd4d55efbbb459bd91f48' into master-merge

diff --cc tools/quake3/common/scriplib.c
Simple merge

diff --cc tools/quake3/common/vfs.c
Simple merge

diff --cc tools/quake3/common/vfs.h
Simple merge

diff --cc tools/quake3/q3map2/bspfile_abstract.c
Simple merge

diff --cc tools/quake3/q3map2/main.c
Simple merge

diff --cc tools/quake3/q3map2/shaders.c
Simple merge