Merge branch '3.0' into 3.1 3.1.final
authorMarcel Werk <burntime@woltlab.com>
Thu, 30 Jul 2020 11:28:35 +0000 (13:28 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 30 Jul 2020 11:28:35 +0000 (13:28 +0200)

Trivial merge