Merge branch 'master' into divVerent/stormkeep-sRGB

diff --cc maps/stormkeep.map.options
index f5b739fd268253559147fca38cec49d697208348,7d0320589eca0f6ed5fb73c9a66381aec6d548c8..05f42d627d27ba1cfb3edec9c3a383e5151d4706
--- 1/maps/stormkeep.map.options
--- 2/maps/stormkeep.map.options
+++ b/maps/stormkeep.map.options
@@@ -1,5 -1,6 +1,6 @@@
 --bsp +
 --light + -bounce 8 -dirtscale 2
 +-bsp + -sRGBcolor -sRGBtex
 +-light + -sRGBcolor -sRGBtex -sRGBlight -bounce 8 -dirtscale 2 -sphericalscale 0.5
  -vis +
  -minimap +
+ -nosRGB
  Version: 6