Merge branch 'master' into convert-oc_appconfig

apps/files/ajax/upload.php

apps/files/js/filelist.js

apps/files/js/files.js

apps/files_encryption/hooks/hooks.php

apps/files_encryption/tests/hooks.php

apps/files_external/lib/config.php

apps/files_sharing/lib/cache.php

apps/files_sharing/lib/share/file.php

apps/user_ldap/appinfo/info.xml

apps/user_ldap/js/settings.js

apps/user_ldap/lib/access.php

apps/user_ldap/lib/ildapwrapper.php

apps/user_ldap/lib/ldap.php

apps/user_ldap/lib/wizard.php

apps/user_ldap/user_ldap.php

config/config.sample.php

core/ajax/share.php

core/setup/controller.php

lib/private/files/cache/storage.php

lib/private/files/type/detection.php