Merge pull request #1 from mailzwj/master

Auto merge by kpm server
Merge pull request #2 from mailzwj/master

Auto merge by kpm server
Merge pull request #1 from kissygalleryteam/master

合并pull request