Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 15 May 2020 09:48:57 +0000 (11:48 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 15 May 2020 09:48:57 +0000 (11:48 +0200)

Trivial merge