Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 3 Jul 2020 15:16:17 +0000 (17:16 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 3 Jul 2020 15:16:17 +0000 (17:16 +0200)

Trivial merge