Merge branch 'testsuite-work' into tap-testsuite-work