Attempt to correct ModifyDamage
Merge remote-tracking branch 'origin/master'