Merge branch 'compilers-for-testsuite'