Update with ping fix
Merge branch 'master' into bsplushud

* master:
  Update with ping fix