Update build script
Update build script
Minor fix
Build fix
Merge remote-tracking branch 'upstream/master'