同步 #12

Closed
m6wf5oeyl wants to merge 4 commits from master into zhangchaoqun_branch