Merge branch 'alpha' into file-types

Author: dblythy

spec/helper.js

@@ -30,7 +30,6 @@ if (global._babelPolyfill) {
   console.error('We should not use polyfilled tests');
   process.exit(1);
 }
-
 process.noDeprecation = true;
 
 const cache = require('../lib/cache').default;

src/Routers/FilesRouter.js

@@ -127,7 +127,7 @@ export class FilesRouter {
     }
     const filesController = config.filesController;
     const { filename } = req.params;
-    const contentType = req.get('Content-type') || mime.getType(filename);
+    const contentType = req.get('Content-type');
 
     if (!req.body || !req.body.length) {
       next(new Parse.Error(Parse.Error.FILE_SAVE_ERROR, 'Invalid file upload.'));