Merge branch 'master' into divVerent/g-23-srgbcolor

diff --cc maps/g-23.map.options
index 26061c8654601bac3826f0ed0f9a54397638c7a8,e91a95df6188682b33c71aef9b66851b1b2f6a0a..e2a8f13b61619914e4e90594d76161f15921cb1e
--- 1/maps/g-23.map.options
--- 2/maps/g-23.map.options
+++ b/maps/g-23.map.options
@@@ -1,5 -1,5 +1,5 @@@
 --bsp + -sRGBtex -samplesize 4
 --light + -sRGBtex -sRGBlight -bounce 8 -dirtscale 2 -sphericalscale 0.5 -spotscale 1.5 -areascale 0.5 -skyscale 1.5
 +-bsp + -sRGBtex -sRGBcolor -samplesize 4
 +-light + -sRGBtex -sRGBcolor -sRGBlight -bounce 8 -dirtscale 2 -sphericalscale 0.5 -spotscale 1.5 -areascale 0.5 -skyscale 1.5
  -vis +
  -minimap +
- Version: 5
+ Version: 6