Merge branch '3.1' into 5.2
authorAlexander Ebert <ebert@woltlab.com>
Fri, 28 Aug 2020 13:15:09 +0000 (15:15 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 28 Aug 2020 13:15:09 +0000 (15:15 +0200)

Trivial merge