Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 26 Jun 2020 14:14:22 +0000 (16:14 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 26 Jun 2020 14:14:22 +0000 (16:14 +0200)

Trivial merge