Command-line tools fix
Compile fix
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	run.n
	tools/run-script/src/RunScript.hx