Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Sat, 23 May 2020 14:23:20 +0000 (16:23 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sat, 23 May 2020 14:23:20 +0000 (16:23 +0200)

Trivial merge