Merge remote-tracking branch 'origin/master'

Conflicts:
	python/text/translator.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	python/text/translator.py