Merge branch '5.2' into master
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 15 Sep 2020 09:56:55 +0000 (11:56 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 15 Sep 2020 09:56:55 +0000 (11:56 +0200)

Trivial merge