Merge branch 'master' into encryption_improved_error_messages_4617

apps/files/ajax/rawlist.php

apps/files/appinfo/remote.php

apps/files/js/files.js

apps/files/l10n/ca.php

apps/files/l10n/el.php

apps/files/l10n/en_GB.php

apps/files/l10n/fr.php

apps/files/l10n/gl.php

apps/files/l10n/hu_HU.php

apps/files/l10n/nn_NO.php

apps/files/l10n/uk.php

apps/files/lib/helper.php

apps/files/templates/index.php

apps/files_encryption/l10n/uk.php

apps/files_encryption/lib/keymanager.php

apps/files_encryption/lib/proxy.php

apps/files_sharing/lib/cache.php

apps/files_sharing/public.php

apps/files_trashbin/l10n/hu_HU.php

apps/files_trashbin/lib/helper.php