Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into maint