foreign directories deleted
Merge remote-tracking branch 'origin/FileMap' into FileMap