Merge branch '5.2'
authorjoshuaruesweg <ruesweg@woltlab.com>
Thu, 13 Aug 2020 07:46:00 +0000 (09:46 +0200)
committerjoshuaruesweg <ruesweg@woltlab.com>
Thu, 13 Aug 2020 07:46:00 +0000 (09:46 +0200)

Trivial merge