Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 7 Jul 2020 13:11:31 +0000 (15:11 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 7 Jul 2020 13:11:31 +0000 (15:11 +0200)

Trivial merge