Merge branch 'master' into encryption_initial_enc_indicator

apps/files/index.php

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/keymanager.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/lib/stream.php

apps/files_encryption/lib/util.php

apps/files_encryption/tests/crypt.php

apps/files_encryption/tests/keymanager.php

apps/files_sharing/public.php

apps/user_ldap/ajax/wizard.php

apps/user_ldap/group_proxy.php

apps/user_ldap/js/settings.js

apps/user_ldap/lib/access.php

apps/user_ldap/lib/configuration.php

apps/user_ldap/lib/proxy.php

apps/user_ldap/lib/wizard.php

apps/user_ldap/templates/part.wizard-loginfilter.php

apps/user_ldap/templates/settings.php

apps/user_ldap/user_ldap.php

apps/user_ldap/user_proxy.php