Merge branch '5.2'
authorjoshuaruesweg <ruesweg@woltlab.com>
Sun, 10 May 2020 13:24:03 +0000 (15:24 +0200)
committerjoshuaruesweg <ruesweg@woltlab.com>
Sun, 10 May 2020 13:24:03 +0000 (15:24 +0200)

Trivial merge