Merged build script fix from branches/release-1.2
1 file changed