Merge branch 'master' into xpwang_test
doc local

commit
Merge branch 'xpwang_test'