Updates build scripts
Merge commit 'ee6126aed8c92a3fc50c9fff2a23499033bb1a95' into HEAD