加上中文提交
Merge remote-tracking branch 'origin/chinase_stash' into chinase_stash