Merge branch 'master' into 54-typescript
authorAlexander Ebert <ebert@woltlab.com>
Sun, 3 Jan 2021 15:45:15 +0000 (16:45 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 3 Jan 2021 15:45:15 +0000 (16:45 +0100)

Trivial merge