Ragdoll reset fix
Merge branch 'master' into master2
Merge remote-tracking branch 'origin/master' into master2