Merge remote-tracking branch 'origin/master' into matthiaskrgr/srgb

diff --cc maps/finalrage.map.options
index 55a5917f54f20c141d6dfa2841de9d6d2eeec444,36c47729d1c6eabe0cd524a107bf5bd94ac84c49..6d4bed1866bb10243fd242b5c8fc5dc813f8b060
--- 1/maps/finalrage.map.options
--- 2/maps/finalrage.map.options
+++ b/maps/finalrage.map.options
@@@ -2,5 -2,4 +2,5 @@@
  -light + -bounce 8 -dirtscale 2
  -vis +
  -minimap +
 -Version: 1c
 +-sRGB
- Version: 1b
++Version: 1c