Merge pull request #2006 from Sean-Kenneth-Doherty/codex/single-dash-search-path