Merge remote-tracking branch 'origin/master' into debugger/aurora_ctf

Conflicts:
	scripts/shaderlist.txt

diff --cc scripts/shaderlist.txt
index 1aa381dd057f3e1ea2af93caedba79832622f51f,e6a748b2d0d8c4448692d22aaa17bfd14e8b2a77..4cff15d02f11f1e1842f4eaadfa40c4f67b00eb2
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -18,7 -19,7 +19,8 @@@ liquids_lav
  liquids_slime
  liquids_water
  logos
 +map_aurora
+ map_catharsis
  map_courtfun
  map_darkzone
  map_g-23