Merge branch '5.2'
authorjoshuaruesweg <ruesweg@woltlab.com>
Thu, 11 Jun 2020 19:07:14 +0000 (21:07 +0200)
committerjoshuaruesweg <ruesweg@woltlab.com>
Thu, 11 Jun 2020 19:07:14 +0000 (21:07 +0200)

Trivial merge