应用了 cherry-pick 功能
Merge remote-tracking branch 'origin/master' into develop

* origin/master:
  应用了 cherry-pick 功能

Conflicts:
	README.md