Merge branch 'master' into xurui
Merge branch 'xurui'