Very small tweak
Merge branch 'master' into combat