Merge branch 'master' into Mario/wepent_experimental

diff --cc defaultXonotic.cfg
Simple merge

diff --cc mutators.cfg
Simple merge

diff --cc qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
Simple merge

diff --cc qcsrc/common/t_items.qc
Simple merge

diff --cc qcsrc/server/bot/default/havocbot/havocbot.qc
Simple merge

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