Merge branch 'master' into fix_glob_escaping

Conflicts:
	apps/files_trashbin/lib/trash.php

diff --cc 3rdparty
index 3ef9f738a9107879dddc7d97842cf4d2198fae4c,3ef9f738a9107879dddc7d97842cf4d2198fae4c..e312294ef62873df2b8c02e774f9dfe1b7fbc38d
--- 1/3rdparty
--- 2/3rdparty
+++ b/3rdparty
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 3ef9f738a9107879dddc7d97842cf4d2198fae4c
++Subproject commit e312294ef62873df2b8c02e774f9dfe1b7fbc38d

diff --cc apps/files_trashbin/lib/trash.php
index 2e9c00039dbb465132dd269ab0af0575cbb87c66,7b8d3cb4252fbe173a3c28bcb74cc376c5f5835c..1235d9d2ee07234807720e37f757afdb08de499c
--- 1/apps/files_trashbin/lib/trash.php
--- 2/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@@ -48,15 -47,22 +48,22 @@@ class Trashbin 
         */
        public static function move2trash($file_path) {
                $user = \OCP\User::getUser();
 -              $view = new \OC\Files\View('/'. $user);
 +              $view = new \OC\Files\View('/' . $user);
                if (!$view->is_dir('files_trashbin')) {
                        $view->mkdir('files_trashbin');
+               }
+               if (!$view->is_dir('files_trashbin/files')) {
                        $view->mkdir('files_trashbin/files');
+               }
+               if (!$view->is_dir('files_trashbin/versions')) {
                        $view->mkdir('files_trashbin/versions');
+               }
+               if (!$view->is_dir('files_trashbin/keyfiles')) {
                        $view->mkdir('files_trashbin/keyfiles');
+               }
+               if (!$view->is_dir('files_trashbin/share-keys')) {
                        $view->mkdir('files_trashbin/share-keys');
                }
- 
                $path_parts = pathinfo($file_path);
  
                $filename = $path_parts['basename'];