Make it easier to override the ImportCommand behavior that is filesystem-specific
Merge remote-tracking branch 'james/import'