Merge branch '5.2'
authorMarcel Werk <burntime@woltlab.com>
Mon, 18 May 2020 20:52:57 +0000 (22:52 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 18 May 2020 20:52:57 +0000 (22:52 +0200)

Trivial merge