Merge branch 'maint' into testsuite-work