Merge branch 'master' into z411/bai-server

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

diff --cc qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
Simple merge

diff --cc qcsrc/common/stats.qh
Simple merge

diff --cc qcsrc/server/command/vote.qc
index 466d85f722da0a5b27ceaf1c1644ec29ea2fca78,d1be9e9b2e055a17456fa9a9e7f2e771d07fb62b..eee028ff311bbe8128e7620d65d02bf63ffdfc4f
--- 1/qcsrc/server/command/vote.qc
--- 2/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@@ -797,24 -760,12 +797,25 @@@ int VoteCommand_parse(entity caller, st
                        break;
                }
  
-               case "restart":
-               case "resetmatch":  // re-direct all match restarting to resetmatch
 +              case "gg":
 +              case "shuffleteams":
 +              case "endmatch":
 +              {
 +                      // add a delay so that vote result can be seen and announcer can be heard
 +                      // if the vote is accepted
 +                      vote_parsed_command = strcat("defer 2 ", vote_command);
 +                      vote_parsed_display = strzone(strcat("^1", vote_command));
 +                      
 +                      break;
 +              }
 +
 +              case "reset":
+               case "restart": // re-direct all match restarting to resetmatch
+                       vote_command = "resetmatch"; // fall-through
+               case "resetmatch":
                {
-                       vote_parsed_command = "defer 2 resetmatch";
-                       vote_parsed_display = strzone("^1resetmatch");
 -                      vote_parsed_command = vote_command;
++                      vote_parsed_command = strcat("defer 2 ", vote_command);
+                       vote_parsed_display = strzone(strcat("^1", vote_command));
  
                        break;
                }

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

diff --cc qcsrc/server/damage.qh
Simple merge

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

diff --cc qcsrc/server/teamplay.qh
Simple merge

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