Update README.md
Merge branch 'master' into i18n

Conflicts:
	README.md