ok, one more shot at fixing particle-server crash
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
Merge pull request #1661 from ZappoMan/bugfixes

another attempt to fix particle-server crash