Merge branch 'master' into terencehill/bot_waypoints

diff --combined qcsrc/common/triggers/trigger/jumppads.qc
index 01bcb355d6838aa36a3cb068b415ccd286e11b1a,10a726391c597bdb6b81f97d1596a2690f52f951..a31f5a482f69bf12fff4b93bbe1c162dc9455640
--- 1/qcsrc/common/triggers/trigger/jumppads.qc
--- 2/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@@ -317,7 -317,7 +317,7 @@@ bool trigger_push_test(entity this, ent
  {
        // first calculate a typical start point for the jump
        vector org = (this.absmin + this.absmax) * 0.5;
 -      org.z = this.absmax.z - PL_MIN_CONST.z - 10;
 +      org.z = this.absmax.z - PL_MIN_CONST.z - 7;
  
        if (this.target)
        {
@@@ -606,13 -606,8 +606,8 @@@ NET_HANDLE(ENT_CLIENT_TRIGGER_PUSH, boo
  
  void target_push_remove(entity this)
  {
-       //if(this.classname)
-               //strunzone(this.classname);
-       //this.classname = string_null;
- 
-       if(this.targetname)
-               strunzone(this.targetname);
-       this.targetname = string_null;
+       // strfree(this.classname);
+       strfree(this.targetname);
  }
  
  NET_HANDLE(ENT_CLIENT_TARGET_PUSH, bool isnew)