Merge remote-tracking branch '36668/patch-1' into comm_voted

Author: Indraniks

app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php

@@ -33,8 +33,8 @@ class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterf
     private $allowedMimeTypes = [
         'jpg' => 'image/jpg',
         'jpeg' => 'image/jpeg',
-        'gif' => 'image/png',
-        'png' => 'image/gif'
+        'gif' => 'image/gif',
+        'png' => 'image/png'
     ];
 
     /**