Fixes on macdeploy.sh
Minor fixes on windeploy.sh
Merge branch 'temp' into reveng-support