Merge branch 'master' into 54-typescript
authorAlexander Ebert <ebert@woltlab.com>
Fri, 30 Oct 2020 23:17:03 +0000 (00:17 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 30 Oct 2020 23:17:03 +0000 (00:17 +0100)

Trivial merge