Updated the setup script.
Merge remote-tracking branch 'origin/Unstable' into Integration