Merge branch 'master' into 'LegendaryGuard/cyber'

diff --cc qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/electro.qc
Simple merge

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

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

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge

diff --cc qcsrc/server/mutators/events.qh
Simple merge