Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint