Merge branch 'recheck-fix' into maint * recheck-fix: parallel-tests: recipes for "check" and "recheck" are separated again