Merge branch 'master' into fix-20151

apps/encryption/l10n/cs_CZ.js

apps/encryption/l10n/cs_CZ.json

apps/encryption/l10n/ja.js

apps/encryption/l10n/ja.json

apps/encryption/l10n/nl.js

apps/encryption/l10n/nl.json

apps/files/js/fileactions.js

apps/files/js/files.js

apps/files/l10n/zh_TW.js

apps/files/l10n/zh_TW.json

apps/files/tests/js/fileactionsSpec.js

apps/files/tests/js/filesSpec.js

apps/files_external/l10n/cs_CZ.js

apps/files_external/l10n/cs_CZ.json

apps/files_external/l10n/fr.js

apps/files_external/l10n/fr.json

apps/files_external/l10n/it.js

apps/files_external/l10n/it.json

apps/files_external/l10n/ja.js

apps/files_external/l10n/ja.json