Merge branch 'master' into master-merge

diff --cc radiant/CMakeLists.txt
Simple merge

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

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

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

diff --cc tools/quake3/q3map2/q3map2.h
Simple merge