Merge branch 'master' into Mario/teams_bitflag

diff --combined qcsrc/server/cl_client.qc
index 1ca349ee7f775312775bcb6366a67b8f596b26f9,957742be5741efe62f4c3172ee036822e4527cf0..9468eda99f26e72f2c204b4bacbe838ac7ef73d9
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -462,6 -462,8 +462,8 @@@ void PutClientInServer(entity this
        if (IS_OBSERVER(this)) {
                PutObserverInServer(this);
        } else if (IS_PLAYER(this)) {
+               if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE);
+               
                PlayerState_attach(this);
                accuracy_resend(this);
  
@@@ -1145,7 -1147,7 +1147,7 @@@ void ClientConnect(entity this
        if (!sv_foginterval && world.fog != "")
                stuffcmd(this, strcat("\nfog ", world.fog, "\nr_fog_exp2 0\nr_drawfog 1\n"));
  
 -      if (autocvar_sv_teamnagger && !(autocvar_bot_vs_human && (c3==-1 && c4==-1)))
 +      if (autocvar_sv_teamnagger && !(autocvar_bot_vs_human && AvailableTeams() == 2))
                if (!g_ca && !g_cts && !g_race) // teamnagger is currently bad for ca, race & cts
                        send_CSQC_teamnagger();