Merge branch 'master' into drjaska/falloffcvars

diff --cc qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/okshotgun.qc
Simple merge

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

diff --cc qcsrc/common/weapons/weapon/machinegun.qh
Simple merge

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

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

diff --cc qcsrc/server/weapons/tracing.qc
Simple merge