particle and catching tweaks
Merge remote-tracking branch 'origin/master'

Conflicts:
	Library/metadata/f9/f91e79cd3d139d14cb1a6ff6e4d1886c