Merge branch 'master' into testsuite-work