合并错误回滚
Merge branch 'Develop' of https://github.com/lunnlew/candy into Develop