Build script updates picked from v0.9
Merge pull request #1899 from libm/v0.8

Build script updates picked from v0.9