Updated handling of remote files
Merge branch 'merge' into release