Merge branch 'master' into martin-t/okc3

diff --cc balance-mario.cfg
Simple merge

diff --cc balance-overkill.cfg
Simple merge

diff --cc balance-xdf.cfg
Simple merge

diff --cc qcsrc/server/g_damage.qc
index 5e4007ab0a9e6a28a58216f5d3706dd8479466ac,a25ae5bec9f878d9ba5feca5a6bb2f7e7c55bae6..0dc18866dd14abcea499e099601b3315b9b27233
--- 1/qcsrc/server/g_damage.qc
--- 2/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@@ -602,15 -562,11 +562,17 @@@ void Unfreeze(entity targ
        if(targ.iceblock)
                delete(targ.iceblock);
        targ.iceblock = NULL;
+ 
+       MUTATOR_CALLHOOK(Unfreeze, targ);
  }
  
- void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force)
 +float autocvar_g_balance_damagepush_scaling_speed_min;
 +float autocvar_g_balance_damagepush_scaling_speed_max;
 +float autocvar_g_balance_damagepush_scaling_reduction_slowest;
 +float autocvar_g_balance_damagepush_scaling_reduction_fastest;
 +float autocvar_g_balance_damagepush_scaling_sideways;
 +float autocvar_g_balance_damagepush_scaling_vertical;
+ void Damage(entity targ, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force)
  {
        float complainteamdamage = 0;
        float mirrordamage = 0;