diff commit
Merge branch 'master' into xianrui