Updated build scripts.
Merge branch 'develop'