Merge branch 'master' into drjaska/falloffcvars

diff --cc bal-wep-mario.cfg
Simple merge

diff --cc bal-wep-xdf.cfg
Simple merge

diff --cc bal-wep-xonotic.cfg
Simple merge

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

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

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

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