Merge branch 'master' into fixing-4343-master

Conflicts:
	lib/connector/sabre/quotaplugin.php

diff --cc lib/connector/sabre/quotaplugin.php
index eb95a839b867621cfb52e3c8e5f86741febf6a2e,34d4b676157404c010ec9564b744e000ada65a1e..c8ce65a85767dd1f1f7a5f52e8d41bc4ce9024e4
--- 1/lib/connector/sabre/quotaplugin.php
--- 2/lib/connector/sabre/quotaplugin.php
+++ b/lib/connector/sabre/quotaplugin.php
@@@ -59,8 -50,8 +59,8 @@@ class OC_Connector_Sabre_QuotaPlugin ex
                                $uri='/'.$uri;
                        }
                        list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri);
 -                      $freeSpace = \OC\Files\Filesystem::free_space($parentUri);
 +                      $freeSpace = $this->fileView->free_space($parentUri);
-                       if ($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN && $length > $freeSpace) {
+                       if ($freeSpace !== \OC\Files\SPACE_UNKNOWN && $length > $freeSpace) {
                                throw new Sabre_DAV_Exception_InsufficientStorage();
                        }
                }