Smissmas update
Merge branch 'master' into bsplushud

* master:
  Smissmas update