Merge branch 'master' into fix-7307

.scrutinizer.yml

3rdparty

apps/files/ajax/move.php

apps/files/js/file-upload.js

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/templates/part.list.php

apps/files/tests/js/filesSpec.js

apps/files_encryption/lib/util.php

apps/files_external/js/settings.js

apps/files_external/lib/config.php

apps/files_external/personal.php

apps/files_external/settings.php

apps/files_external/templates/settings.php

apps/files_sharing/js/share.js

apps/files_sharing/lib/cache.php

apps/files_sharing/lib/share/file.php

apps/user_ldap/lib/helper.php

apps/user_ldap/user_proxy.php

config/config.sample.php