Merge branch 'master' into pending-release

diff --combined qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
index 5fbb2b2a68ea985daa18c8200f533973b7c8a433,a1e1c59900ba4ac5ac435e8dcdc73d431f0bc57a..83cf455c3597e781902df217031b5f559c255377
--- 1/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
--- 2/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
+++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
@@@ -1304,11 -1304,6 +1304,11 @@@ void ctf_FlagSetup(int teamnum, entity 
        flag.nextthink = time + FLAG_THINKRATE;
        flag.ctf_status = FLAG_BASE;
  
 +      // set correct team colors
 +      flag.glowmod = Team_ColorRGB(teamnum);
 +      flag.colormap = (teamnum) ? (teamnum - 1) * 0x11 : 0x00;
 +      flag.colormap |= BIT(10); // RENDER_COLORMAPPED
 +
        // crudely force them all to 0
        if(autocvar_g_ctf_score_ignore_fields)
                flag.cnt = flag.score_assist = flag.score_team_capture = flag.score_capture = flag.score_drop = flag.score_pickup = flag.score_return = 0;
@@@ -1758,7 -1753,7 +1758,7 @@@ void havocbot_role_ctf_carrier(entity t
  
                entity goal = this.goalentity;
                if (havocbot_ctf_is_basewaypoint(goal) && vdist(goal.origin - this.origin, <, 100))
-                       this.goalentity_lock_timeout = time + ((this.bot_aimtarg) ? 2 : 3);
+                       this.goalentity_lock_timeout = time + ((this.enemy) ? 2 : 3);
  
                if (goal)
                        this.havocbot_cantfindflag = time + 10;