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

Trivial merge