Merge branch 'weaponsbranch'