Merge branch 'jc/maint-protect-sh-from-ifs'