Merge branch 'master' into terencehill/centerprint_stuff

diff --cc qcsrc/client/View.qc
Simple merge

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
index 897f2c5a3671fe58069d4ff05db075b3fb5bf352,9a1d4100473f0967dae2bea37e158ed5103805a2..a3a951b88056fbf3b1d264a73f6f2a9cb185fd99
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -2583,8 -2620,11 +2583,10 @@@ void SpectatorThink(
                                return;
                        }
                }
+               if(!SpectateUpdate())
+                       PutObserverInServer();
        }
  
 -      PrintWelcomeMessage(self);
        self.flags |= FL_CLIENT | FL_NOTARGET;
  }
  

diff --cc qcsrc/server/g_damage.qc
Simple merge

diff --cc qcsrc/server/w_minstanex.qc
Simple merge