merge master into filesystem

apps/files/ajax/move.php

apps/files/ajax/newfile.php

apps/files/templates/part.breadcrumb.php

apps/files/templates/part.list.php

apps/files_encryption/lib/cryptstream.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/settings.php

apps/files_encryption/tests/encryption.php

apps/files_encryption/tests/proxy.php

apps/files_encryption/tests/stream.php

apps/files_external/l10n/zh_CN.php

apps/files_external/lib/ftp.php

apps/files_external/lib/google.php

apps/files_external/lib/swift.php

apps/files_external/lib/webdav.php

apps/files_sharing/public.php

apps/files_versions/lib/hooks.php

apps/files_versions/lib/versions.php

apps/user_ldap/lib/access.php

apps/user_ldap/tests/group_ldap.php