Merge branches 'avoid-linking' and 'build-executables-in-parallel'