Merge branch '5.2' into master
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 6 Oct 2020 07:39:25 +0000 (09:39 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 6 Oct 2020 07:39:25 +0000 (09:39 +0200)

Trivial merge