Merge remote-tracking branch 'remotes/origin/v2-stable'
remove end
Merge remote-tracking branch 'remotes/origin/v2-file' into v2-stable

Conflicts:
	v2.txt