Merge branch 'py' into iss1

Conflicts:
	text-replacer-with-file