Merge branch 'ak/git-strip-extension-from-dashed-command'