Merge pull request #2404 from rosysong/file-server