Changes the build script a bit
Merge commit '23b0ecdc14a75d5bca938495923e5bdbd16613e2' into HEAD