Testing some shit to fix combat stat display
Merge remote-tracking branch 'upstream/master'