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