Merge branch 'master' into develop

.github/history.json

.mocharc.js

HISTORY.md

app/api/server/v1/cloud.ts

app/cloud/server/functions/retrieveRegistrationStatus.js

app/cloud/server/functions/syncWorkspace.js

app/lib/server/startup/settings.ts

app/models/server/models/Rooms.js

app/statistics/server/functions/otrStats.ts

app/statistics/server/lib/statistics.ts

client/components/Emoji.tsx

client/components/MarkdownText.tsx

client/components/Sidebar/GenericItem.tsx

client/sidebar/header/UserDropdown.tsx

client/views/admin/AdministrationRouter.tsx

client/views/admin/permissions/NewRolePage.js

client/views/admin/permissions/RoleForm.js

client/views/admin/routes.js

client/views/admin/sidebar/AdminSidebarPages.tsx

client/views/admin/sidebar/UpgradeTab.tsx