Merge branch 'hot-fixed'
Merge branch 'hot-fixed'
Merge branch 'master' of https://github.com/Mrzy/kaka