Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11