Fix bug in spread hit damage calculation
Merge remote-tracking branch 'upstream/master'