Merge branch '5.2' into master
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 19 Aug 2020 07:51:42 +0000 (09:51 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 19 Aug 2020 07:51:42 +0000 (09:51 +0200)

Trivial merge