Fixed syntax error in windows bat.
Merge remote-tracking branch 'origin/master'
minor tweak.
Merge branch 'master' into script-executor