Disable osx dashboard
Merge branch 'master' into work

* master:
  Disable osx dashboard