Merge branch '5.2'
authorjoshuaruesweg <ruesweg@woltlab.com>
Mon, 3 Aug 2020 16:27:49 +0000 (18:27 +0200)
committerjoshuaruesweg <ruesweg@woltlab.com>
Mon, 3 Aug 2020 16:27:49 +0000 (18:27 +0200)

Trivial merge