Merge branch 'master' into files_encryption_upgrade_fix

apps/files_encryption/hooks/hooks.php

apps/files_encryption/lib/util.php

apps/files_encryption/tests/util.php

l10n/af_ZA/core.po

l10n/af_ZA/lib.po

l10n/ar/core.po

l10n/ar/lib.po

l10n/bg_BG/core.po

l10n/bg_BG/lib.po

l10n/bn_BD/core.po

l10n/bn_BD/lib.po

l10n/bs/core.po

l10n/bs/files.po

l10n/bs/files_encryption.po

l10n/bs/files_external.po

l10n/bs/files_sharing.po

l10n/bs/files_trashbin.po

l10n/bs/files_versions.po

l10n/bs/lib.po

l10n/bs/settings.po