Merge branch 'master' into file_encryption_external_storage_fixes

apps/files_encryption/ajax/adminrecovery.php

apps/files_encryption/ajax/changeRecoveryPassword.php

apps/files_encryption/ajax/userrecovery.php

apps/files_encryption/appinfo/app.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/lib/crypt.php

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/keymanager.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/lib/session.php

apps/files_encryption/lib/stream.php

apps/files_encryption/lib/util.php

apps/files_encryption/settings-admin.php

apps/files_encryption/settings-personal.php

apps/files_encryption/tests/crypt.php

apps/files_encryption/tests/webdav.php

lib/files/cache/scanner.php

lib/mail.php