Merge branch 'bones_was_here/misc2' into 'master'

Misc low importance stuff

See merge request xonotic/xonotic-data.pk3dir!901

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

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

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

diff --cc xonotic-client.cfg
Simple merge