Merge branch 'master' into encryption_improved_error_messages_4617

Conflicts:
	settings/ajax/changepassword.php

diff --cc apps/files/index.php
Simple merge

diff --cc apps/files/js/files.js
Simple merge

diff --cc apps/files_encryption/appinfo/app.php
Simple merge

diff --cc apps/files_encryption/hooks/hooks.php
Simple merge

diff --cc apps/files_encryption/lib/util.php
Simple merge