Merge commit 'f3d0806dfea23aef768535ee2fc8e1fff9aebe9f' into master-merge

diff --cc radiant/gtkdlgs.cpp
Simple merge

diff --cc radiant/mainframe.cpp
Simple merge

diff --cc radiant/preferences.cpp
Simple merge

diff --cc tools/quake3/q3map2/bsp.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/main.c
Simple merge

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