Merge branch 'master' into files_encryption_fs_loaded_fix

apps/files_encryption/hooks/hooks.php

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/keymanager.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/lib/util.php

apps/files_encryption/tests/webdav.php

apps/files_versions/lib/versions.php

lib/public/share.php