Merge branch 'master' into files_encryption

apps/files/l10n/sk_SK.php

apps/files/l10n/tr.php

apps/files_sharing/public.php

apps/user_ldap/l10n/tr.php

cron.php

l10n/sk_SK/files.po

l10n/templates/core.pot

l10n/templates/files.pot

l10n/templates/files_encryption.pot

l10n/templates/files_external.pot

l10n/templates/files_sharing.pot

l10n/templates/files_trashbin.pot

l10n/templates/files_versions.pot

l10n/templates/lib.pot

l10n/templates/settings.pot

l10n/templates/user_ldap.pot

l10n/templates/user_webdavauth.pot

l10n/tr/files.po

l10n/tr/user_ldap.po