Merge branch 'master' into HEAD

Conflicts:
	123.txt
Merge branch 'dev2' into dev

Conflicts:
	123.txt