Merge branch 'master' into z411/new_centerprint

diff --cc qcsrc/client/announcer.qc
index 58c2727f7705a34bdb4a6ae3510804c970b25671,1bbf900375e025f66f059202f7eae6c5b826b50d..64606a6846f413d771bcd79fba52645156660d1d
--- 1/qcsrc/client/announcer.qc
--- 2/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@@ -27,11 -26,8 +27,9 @@@ void Announcer_Countdown(entity this
                Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
                delete(this);
                announcer_countdown = NULL;
 +              centerprint_ClearTitle();
                return;
        }
-       if(starttime <= time && roundstarttime != starttime) // game start time has passed
-               announcer_5min = announcer_1min = false; // reset maptime announcers now as well
  
        bool inround = (roundstarttime && time >= starttime);
        float countdown = (inround ? roundstarttime - time : starttime - time);