Merge branch 'dw/shell-basename-dashdash-before-stripping-leading-dash-from-login'