[2.2.1] Fixed cooldowns :P
Merge remote-tracking branch 'origin/master'