Merge branch 'master' into Mario/weapons_fpsfix

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

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

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

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

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

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

diff --cc xonotic-client.cfg
Simple merge