Merge pull request #2258 from vlakoff/develop

Fix a code comment in Upload->_file_mime_type()