Merge branch 'mm/no-shell-escape-in-die-message' into maint