Merge branch 'weaponitem'