fix bug 3.0 user2
Merge branch 'v3.x' of https://github.com/PengCX/GitTest into v3.x

Conflicts:
	rebase.txt