Merge branch 't/testsuite'