Smissmas update
Merge branch 'master' into bsplushud

* master:
  Smissmas update
Merge branch 'bsplushud' into bsplushud_withoutkillfeed

* bsplushud:
  Smissmas update