Cleanup particles
Merge branch 'master' into js
Merged
More webkit fixes