Merge branch 'master' into home-storage

apps/files/js/file-upload.js

apps/files/js/filelist.js

apps/files/l10n/ca.php

apps/files/l10n/de.php

apps/files/l10n/de_DE.php

apps/files/l10n/en_GB.php

apps/files/l10n/es.php

apps/files/l10n/et_EE.php

apps/files/l10n/fi_FI.php

apps/files/l10n/fr.php

apps/files/l10n/gl.php

apps/files/l10n/it.php

apps/files/l10n/ja_JP.php

apps/files/l10n/lt_LT.php

apps/files/l10n/mk.php

apps/files/l10n/ms_MY.php

apps/files/l10n/pl.php

apps/files/l10n/pt_BR.php

apps/files/l10n/sv.php

apps/files/l10n/tr.php