ssaed
Merge branch 'stable'

Conflicts:
	t.txt