Merge branch 'mm/die-with-dashdash-help'