Merge branch 'master' into shared-folder-etags

apps/files/ajax/download.php

apps/files/js/files.js

apps/files/l10n/es.php

apps/files/l10n/sv.php

apps/files/templates/admin.php

apps/files_encryption/l10n/nb_NO.php

apps/files_external/l10n/nb_NO.php

apps/files_external/l10n/sv.php

apps/files_sharing/lib/share/file.php

apps/files_sharing/lib/sharedstorage.php

apps/files_trashbin/index.php

apps/files_trashbin/templates/part.breadcrumb.php

apps/user_ldap/group_ldap.php

apps/user_ldap/group_proxy.php

apps/user_ldap/l10n/es.php

apps/user_ldap/l10n/nb_NO.php

apps/user_ldap/l10n/sv.php

apps/user_ldap/settings.php

apps/user_ldap/templates/settings.php

core/ajax/update.php