Merge branch '5.2' into 5.3
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 23 Oct 2020 10:50:23 +0000 (12:50 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 23 Oct 2020 10:50:23 +0000 (12:50 +0200)

Trivial merge