merge master into filesystem

apps/files/css/files.css

apps/files/js/fileactions.js

apps/files/js/files.js

apps/files/l10n/nl.php

apps/files/l10n/pl.php

apps/files_encryption/templates/settings.php

apps/files_external/lib/config.php

apps/files_external/templates/settings.php

apps/files_sharing/js/share.js

apps/files_sharing/public.php

apps/files_versions/history.php

apps/files_versions/lib/versions.php

apps/files_versions/templates/settings.php

apps/user_ldap/l10n/ca.php

apps/user_ldap/l10n/cs_CZ.php

apps/user_ldap/l10n/de.php

apps/user_ldap/l10n/de_DE.php

apps/user_ldap/l10n/el.php

apps/user_ldap/l10n/es.php

apps/user_ldap/l10n/es_AR.php