Merge remote-tracking branch 'origin/master'

Conflicts:
	python/log.txt
	python/res.txt