Merge branch 'master' into fixing-4488-master

.gitignore

apps/files/js/file-upload.js

apps/files/l10n/ach.php

apps/files/l10n/af_ZA.php

apps/files/l10n/be.php

apps/files/l10n/bs.php

apps/files/l10n/de_AT.php

apps/files/l10n/de_CH.php

apps/files/l10n/en_GB.php

apps/files/l10n/es_MX.php

apps/files/l10n/hi.php

apps/files/l10n/km.php

apps/files/l10n/kn.php

apps/files/l10n/ml_IN.php

apps/files/l10n/ne.php

apps/files/l10n/nqo.php

apps/files/l10n/pa.php

apps/files/l10n/sk.php

apps/files/l10n/sw_KE.php

apps/files_encryption/appinfo/app.php