Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 27 Jul 2020 14:13:56 +0000 (16:13 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 27 Jul 2020 14:13:56 +0000 (16:13 +0200)

Trivial merge