Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 6 Jul 2020 15:21:50 +0000 (17:21 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 6 Jul 2020 15:21:50 +0000 (17:21 +0200)

Trivial merge