Fixed syntax error with the build script
Merge branch 'v3.0'