Fixed SelfTest for weapons
Merge branch 'refs/remotes/origin/master'