Merge branch 'pd/completion-filenames-fix'