Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

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

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

diff --cc qcsrc/common/command/generic.qc
Simple merge

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

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