Merge pull request #565 from jvalue/file-import-path-completion

Merge pull request #565 from jvalue/file-import-path-completion #1674