merge master into webdav-injection

diff --cc lib/private/connector/sabre/file.php
index cbecd90b7d6e73295b0da41408bd736f81066196,750d646a8f588e5dbfa813881b1f7fef0498ebdc..a9de41adf4d6ab9b085509545c1d0cbf7a5176f1
--- 1/lib/private/connector/sabre/file.php
--- 2/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@@ -191,7 -204,14 +191,9 @@@ class OC_Connector_Sabre_File extends O
         * @return mixed
         */
        public function getContentType() {
-               return $this->info->getMimetype();
 -              if (isset($this->fileinfo_cache['mimetype'])) {
 -                      $mimeType = $this->fileinfo_cache['mimetype'];
 -              } else {
 -                      $mimeType = \OC\Files\Filesystem::getMimeType($this->path);
 -              }
++              $mimeType = $this->info->getMimetype();
+ 
+               return \OC_Helper::getSecureMimeType($mimeType);
 -
        }
  
        /**