Fix glitched cooldown rendering on other slots when using two-step power
Merge pull request #1220 from dorkster/fixes

Fix glitched cooldown rendering on other slots when using two-step power
eliminate warnings
Merge pull request #1222 from igorko/master

eliminate warnings
Merge remote-tracking branch 'upstream/master'