Merge branch 'master' into fixing-3942-master

apps/files/ajax/upload.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/keymanager.php

apps/files_encryption/lib/util.php

apps/files_encryption/tests/util.php

apps/files_sharing/js/public.js

apps/files_sharing/public.php

apps/files_sharing/templates/public.php

apps/files_trashbin/lib/trash.php

core/js/share.js

core/templates/altmail.php

core/templates/mail.php

lib/config.php

lib/public/share.php

tests/lib/files/cache/scanner.php