Merge "Improve MIME detection in FileBackend"