Merge branch 'master' into backgroundscan-reuse-etag

apps/files/l10n/it.php

apps/files/l10n/ru_RU.php

apps/files/templates/index.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/l10n/it.php

apps/files_encryption/l10n/ja_JP.php

apps/files_encryption/lib/util.php

apps/files_encryption/templates/settings-personal.php

apps/files_sharing/lib/updater.php

apps/files_trashbin/lib/trashbin.php

apps/user_ldap/ajax/setConfiguration.php

apps/user_ldap/ajax/testConfiguration.php

apps/user_ldap/js/settings.js

apps/user_ldap/l10n/ko.php

apps/user_ldap/l10n/uk.php

apps/user_ldap/lib/configuration.php

apps/user_ldap/lib/ldap.php

apps/user_ldap/lib/wizard.php

config/config.sample.php

core/js/multiselect.js