Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 1 Jul 2020 10:59:18 +0000 (12:59 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 1 Jul 2020 10:59:18 +0000 (12:59 +0200)

Trivial merge