Merge branch 'master' into develop
fixing double death sounds
Merge branch 'develop'