Merge branch 'master' into jingxian2