Merge branch 'jc/completion-no-chdir'