Merge branch 'master' into scrutinizer_documentation_patches

apps/files/css/files.css

apps/files/index.php

apps/files_encryption/ajax/adminrecovery.php

apps/files_encryption/ajax/getMigrationStatus.php

apps/files_encryption/appinfo/app.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/js/detect-migration.js

apps/files_encryption/js/encryption.js

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/lib/session.php

apps/files_encryption/lib/util.php

apps/files_encryption/settings-admin.php

apps/files_encryption/settings-personal.php

apps/files_encryption/tests/share.php

apps/files_encryption/tests/util.php

apps/files_external/lib/google.php

apps/files_sharing/css/public.css

apps/files_sharing/lib/api.php

apps/files_sharing/public.php