Merge branch 'file-magic'