Added code to automatically discover references to external objects
defined in other files in current project.
Fixed deadlock in File Imports wizard.
Merge remote-tracking branch 'upstream/master'