Fix windows script.
Merge branch 'master' into gama