Getting ready for champs.
Merge remote-tracking branch 'origin/master'
Stats upgrades.