No longer attacks the shopkeeper by default when holding a weapon.
Merge branch 'stable' into dev