Merge branch 'master' into fix-5788-master

Conflicts:
	apps/files_encryption/lib/util.php