Merge branch 'master' into Xuefeng
Tested
Merge branch 'Xuefeng'