Merge branch 'master' into fixing-bugtracker-link-master

apps/files/index.php

apps/files/templates/admin.php

apps/files/templates/index.php

apps/files/templates/part.breadcrumb.php

apps/files/templates/part.list.php

apps/files/templates/upgrade.php

apps/files_encryption/templates/settings-personal.php

apps/files_encryption/templates/settings.php

apps/files_external/personal.php

apps/files_external/settings.php

apps/files_external/templates/settings.php

apps/files_sharing/public.php

apps/files_sharing/templates/authenticate.php

apps/files_sharing/templates/public.php

apps/files_trashbin/index.php

apps/files_trashbin/templates/index.php

apps/files_trashbin/templates/part.list.php

apps/files_versions/templates/history.php

apps/user_ldap/settings.php

apps/user_ldap/templates/settings.php