Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 3 Jun 2020 11:35:02 +0000 (13:35 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 3 Jun 2020 11:35:02 +0000 (13:35 +0200)

Trivial merge