Fixes https://github.com/herp-a-derp/Corruption-of-Champions/issues/144
Merge remote-tracking branch 'upstream/master'