Fix twohanded weapons not unequipping when equipping a torch
Merge remote-tracking branch 'zini/master' into animation-state