Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 25 May 2020 11:49:40 +0000 (13:49 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 25 May 2020 11:49:40 +0000 (13:49 +0200)

Trivial merge