Merge remote-tracking branch 'origin/master' into yeni

Conflicts:
	README