Merge branch 'testsuite-saner-shell' into maint