Merge branch 'master' into debugger/go

diff --cc scripts/shaderlist.txt
index c0171dc0374c3149cfafc2e7cd5e05a76cfc8bc4,4a3eff5ea82c187b55a94071d1a63ce34893e085..b34901d63b9acf5e81bf11e6ef05d0de9b34427e
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -24,11 -24,8 +24,9 @@@ map_courtfu
  map_darkzone
  map_g-23
  map_glowplant
 +map_go
  map_implosion
  map_leave_em_behind
- map_lightspeed
- map_newtonian-nightmare
  map_oilrig
  map_silentsiege
  map_solarium