fix
Merge branch 'master' into fix_1

Conflicts:
	a.txt