merge master into filesystem

apps/files/ajax/upload.php

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/l10n/zh_CN.php

apps/files_encryption/l10n/ta_LK.php

apps/files_versions/l10n/ru_RU.php

apps/user_webdavauth/l10n/ta_LK.php

apps/user_webdavauth/l10n/zh_CN.php

core/js/share.js

core/l10n/ca.php

core/l10n/de.php

core/l10n/de_DE.php

core/l10n/el.php

core/l10n/es.php

core/l10n/it.php

core/l10n/nl.php

core/l10n/pt_PT.php

core/templates/login.php

cron.php

l10n/ca/core.po