Merge branch 'master' into convert-oc_config

apps/files/ajax/upload.php

apps/files/index.php

apps/files/l10n/bg_BG.php

apps/files/l10n/ca.php

apps/files/l10n/cs_CZ.php

apps/files/l10n/da.php

apps/files/l10n/de.php

apps/files/l10n/de_DE.php

apps/files/l10n/el.php

apps/files/l10n/eo.php

apps/files/l10n/es.php

apps/files/l10n/es_AR.php

apps/files/l10n/et_EE.php

apps/files/l10n/eu.php

apps/files/l10n/fa.php

apps/files/l10n/fi_FI.php

apps/files/l10n/fr.php

apps/files/l10n/gl.php

apps/files/l10n/he.php

apps/files/l10n/hi.php