Merge branch 'build-fixes' into 'master'