tr
Merge branch 'master' into topic/222

Conflicts:
	readme.txt