minor
Merge remote-tracking branch 'origin/win_scripts_branch' into win_scripts_branch

Conflicts:
	bin/benchmark-run-all.sh
minor